fix hls & dash segments cleanup. #4161
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
In the source cycle, it will call hls dispose: srs_error_t SrsLiveSourceManager::notify(int event, srs_utime_t interval, srs_utime_t tick) {
// Do cycle source to cleanup components, such as hls dispose.
if ((err = source->cycle()) != srs_success) {
srs_error_t SrsOriginHub::cycle() {
if ((err = hls->cycle()) != srs_success) {
return srs_error_wrap(err, "hls cycle");
}
srs_error_t SrsHls::cycle() {
if (srs_get_system_time() - last_update_time <= hls_dispose) {
return err;
}
dispose();The stream dead detection will check the delay cleanup: srs_error_t SrsLiveSourceManager::notify(int event, srs_utime_t interval, srs_utime_t tick)
if (source->stream_is_dead()) {
bool SrsLiveSource::stream_is_dead() {
if (now < stream_die_at_ + hub->cleanup_delay()) {
return false;
}
srs_utime_t SrsOriginHub::cleanup_delay() {
srs_utime_t hls_delay = hls->cleanup_delay();
srs_utime_t SrsHls::cleanup_delay()
{
if (!enabled) {
return 0;
}
// We use larger timeout to cleanup the HLS, after disposed it if required.
return _srs_config->get_hls_dispose(req->vhost) * 1.1;
}After FFmepg quit, the HLS is not enabled, so it also disable the dispose. I think we should fix this issue by modify In general, we should think about how to dispose a |
|
+1 I reach here for the same issue, some timeline to fix this? or merge this changes? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Impacted Version
Both v6 and v7.
How to reproduce?
developor6.0releasebranch../objs/srs -c conf/hls.confffmpeg -re -i ./doc/source.flv -c copy -f flv rtmp://localhost/live/livestreampublish a stream for more than 10 seconds to generate the.m3u8and.tsfile.qto quite ffmpeg push stream../objs/nginx/html/live/folder, whether the.m3u8and.tsfiles still exist.the expected behavior is that the
.m3u8and.tsfiles should cleanup a few seconds later after rtmp stop publish.Cause
Introduced by #4097
The hls segments cleanup process is running in this way previously.
srs/trunk/src/app/srs_app_source.cpp
Lines 1847 to 1875 in f8319d6
A timer run above method in period,
source->cycle()will run the hls and dashdispose()method to cleanup segment files.But the
cycle()will exit before rundispose, after #4097 introduced theenabledvariable.Solution
run
source->dispose();before destroySrsLiveSource.